Rollup of 6 pull requests #64257

Centril · 2019-09-07T15:34:47Z

Successful merges:

libstd fuchsia fixes #64023 (libstd fuchsia fixes)
Ensure edition lints and internal lints are enabled with deny-warnings=false #64098 (Ensure edition lints and internal lints are enabled with deny-warnings=false)
Update rustc-guide #64195 (Update rustc-guide)
Aggregation of cosmetic changes made during work on REPL PRs: libsyntax #64226 (Aggregation of cosmetic changes made during work on REPL PRs: libsyntax)
Aggregation of cosmetic changes made during work on REPL PRs: librustc #64227 (Aggregation of cosmetic changes made during work on REPL PRs: librustc)
Upgrade env_logger to 0.6 #64235 (Upgrade env_logger to 0.6)

Failed merges:

We never allowed the warnings, only made them not denied.

Co-Authored-By: Mazdak Farrokhzad <twingoow@gmail.com>

@cramertj

…mertj libstd fuchsia fixes This fixes two bugs in libstd on Fuchsia: - `zx_time_t` was changed to an `i64`, but this never made it into libstd - When spawning processes where any of the stdio were null, libstd attempts to open `/dev/null`, which doesn't exist on Fuchsia r? @cramertj

…crichton Ensure edition lints and internal lints are enabled with deny-warnings=false Previously we only passed the deny command line flags if deny-warnings was enabled, but now we either pass -W... or -D... for each of the flags as appropriate. This is also a breaking change to x.py as it changes `--warnings=allow` to `--warnings=warn` which is what that flag actually did; we don't have an allow warnings mode.

@ehuss

Update rustc-guide r? @ehuss

@Centril

Aggregation of cosmetic changes made during work on REPL PRs: libsyntax Factored out from hacking on rustc for work on the REPL. r? @Centril

@Centril

Aggregation of cosmetic changes made during work on REPL PRs: librustc Factored out from hacking on rustc for work on the REPL. r? @Centril

Upgrade env_logger to 0.6

Centril · 2019-09-07T15:34:59Z

@bors r+ p=6 rollup=never

bors · 2019-09-07T15:35:00Z

📌 Commit 1be1e9c has been approved by Centril

bors · 2019-09-07T16:31:24Z

⌛ Testing commit 1be1e9c with merge e2377b79f2c307b5274bdff6a79879a22ccc34d6...

rust-highfive · 2019-09-07T17:58:43Z

The job LinuxTools of your PR failed (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

2019-09-07T15:38:10.4552781Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-09-07T15:38:10.4761395Z ##[command]git config gc.auto 0
2019-09-07T15:38:10.4849885Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-09-07T15:38:10.4933624Z ##[command]git config --get-all http.proxy
2019-09-07T15:38:10.5081313Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/64257/merge:refs/remotes/pull/64257/merge
---
2019-09-07T17:36:07.0726086Z    Compiling mdbook-linkcheck v0.3.0
2019-09-07T17:36:26.1479512Z    Compiling rustbook v0.1.0 (/checkout/src/tools/rustbook)
2019-09-07T17:36:30.9565478Z     Finished release [optimized] target(s) in 8m 59s
2019-09-07T17:38:23.9753280Z Error: there are broken links
2019-09-07T17:38:23.9756269Z  Caused By: "https://cs.au.dk/~amoeller/spa/" returned 503 Service Unavailable
2019-09-07T17:38:23.9760734Z 
2019-09-07T17:38:23.9761829Z command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/rustbook" "linkcheck" "/checkout/src/doc/rustc-guide"
2019-09-07T17:38:23.9762072Z expected success, got: exit code: 101
2019-09-07T17:38:23.9762209Z 
---
2019-09-07T17:58:13.1930087Z test [compile-fail] compile-fail/reallocate-dangling.rs ... ok
2019-09-07T17:58:13.3567273Z 
2019-09-07T17:58:13.3573368Z error: error pattern ' tried to deallocate Stack memory but gave Machine(Rust) as the kind' not found!
2019-09-07T17:58:13.3577775Z status: exit code: 1
2019-09-07T17:58:13.3584898Z command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools-bin/miri" "tests/compile-fail/stack_free.rs" "-L" "/tmp/compiletestMNNPGd" "--target=x86_64-unknown-linux-gnu" "-C" "prefer-dynamic" "-o" "/tmp/compiletestMNNPGd/stack_free.stage-id" "--edition" "2018" "-Astable-features" "--sysroot" "/home/user/.cache/miri/HOST" "-Zmiri-disable-validation" "-L" "/tmp/compiletestMNNPGd/stack_free.stage-id.aux" "-A" "unused"
2019-09-07T17:58:13.3585314Z ------------------------------------------
2019-09-07T17:58:13.3592785Z 
2019-09-07T17:58:13.3593597Z ------------------------------------------
2019-09-07T17:58:13.3593923Z stderr:
---
2019-09-07T17:58:13.3600549Z     |     ^^^^^^^^^^^^^
2019-09-07T17:58:13.3600776Z     = note: inside call to `main` at /checkout/src/libstd/rt.rs:64:34
2019-09-07T17:58:13.3605478Z     = note: inside call to closure at /checkout/src/libstd/rt.rs:52:53
2019-09-07T17:58:13.3615880Z     = note: inside call to closure at /checkout/src/libstd/panicking.rs:296:40
2019-09-07T17:58:13.3616974Z     = note: inside call to `std::panicking::try::do_call::<[closure@DefId(1:5902 ~ std[af4c]::rt[0]::lang_start_internal[0]::{{closure}}[0]) 0:&dyn std::ops::Fn() -> i32 + std::marker::Sync + std::panic::RefUnwindSafe], i32>` at /checkout/src/libstd/panicking.rs:292:5
2019-09-07T17:58:13.3617936Z     = note: inside call to `std::panicking::try::<i32, [closure@DefId(1:5902 ~ std[af4c]::rt[0]::lang_start_internal[0]::{{closure}}[0]) 0:&dyn std::ops::Fn() -> i32 + std::marker::Sync + std::panic::RefUnwindSafe]>` at /checkout/src/libstd/panic.rs:394:9
2019-09-07T17:58:13.3618897Z     = note: inside call to `std::panic::catch_unwind::<[closure@DefId(1:5902 ~ std[af4c]::rt[0]::lang_start_internal[0]::{{closure}}[0]) 0:&dyn std::ops::Fn() -> i32 + std::marker::Sync + std::panic::RefUnwindSafe], i32>` at /checkout/src/libstd/rt.rs:52:25
2019-09-07T17:58:13.3619537Z     = note: inside call to `std::rt::lang_start::<()>`
2019-09-07T17:58:13.3619775Z 
2019-09-07T17:58:13.3619991Z error: aborting due to previous error
2019-09-07T17:58:13.3620186Z 
---
2019-09-07T17:58:20.8984807Z This PR updated 'src/doc/rustc-guide', verifying if status is 'test-pass'...
2019-09-07T17:58:20.8994287Z 
2019-09-07T17:58:20.8996178Z ⚠️ We detected that this PR updated 'rustc-guide', but its tests failed.
2019-09-07T17:58:20.8996646Z 
2019-09-07T17:58:20.8997269Z If you do intend to update 'rustc-guide', please check the error messages above and
2019-09-07T17:58:20.8997572Z commit another update.
2019-09-07T17:58:20.8997862Z 
2019-09-07T17:58:20.8998548Z If you do NOT intend to update 'rustc-guide', please ensure you did not accidentally
2019-09-07T17:58:20.8999126Z change the submodule at 'src/doc/rustc-guide'. You may ask your reviewer for the
2019-09-07T17:58:20.8999451Z proper steps.
2019-09-07T17:58:20.9017449Z   local time: Sat Sep  7 17:58:20 UTC 2019
2019-09-07T17:58:21.0653358Z   network time: Sat, 07 Sep 2019 17:58:21 GMT
2019-09-07T17:58:21.0656043Z == end clock drift check ==
2019-09-07T17:58:21.0656043Z == end clock drift check ==
2019-09-07T17:58:21.6397875Z ##[error]Bash exited with code '3'.
2019-09-07T17:58:21.6448320Z ##[section]Starting: Checkout
2019-09-07T17:58:21.6450572Z ==============================================================================
2019-09-07T17:58:21.6450633Z Task         : Get sources
2019-09-07T17:58:21.6450706Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

tmandry and others added 19 commits August 29, 2019 17:51

Update zx_time_t to an i64

5da1123

Don't try to use /dev/null on Fuchsia

403701f

fuchsia: Don't fail to spawn if no stdin exists

7bfa2be

fuchsia: Fix default environment behavior when spawning

5f91ad0

Ensure all warnings are emitted even on warnings=warn

c86ea34

Rename --warnings=allow to --warnings=warn

fda251b

We never allowed the warnings, only made them not denied.

update rustc-guide

4c4f25c

Upgrade env_logger to 0.6

8ddbe76

update guide

13413d6

Aggregation of cosmetic changes made during work on REPL PRs: librustc

c1d29ee

Apply suggestions from code review

fd48ca2

Co-Authored-By: Mazdak Farrokhzad <twingoow@gmail.com>

Aggregation of cosmetic changes made during work on REPL PRs: libsyntax

49d2fd1

Apply suggestions from code review

553a56d

Rollup merge of rust-lang#64195 - mark-i-m:update-rustc-guide-1, r=ehuss

9aaeef0

Update rustc-guide r? @ehuss

Rollup merge of rust-lang#64226 - alexreg:rush-pr-3, r=centril

add04de

Aggregation of cosmetic changes made during work on REPL PRs: libsyntax Factored out from hacking on rustc for work on the REPL. r? @Centril

Rollup merge of rust-lang#64227 - alexreg:rush-pr-4, r=centril

7045562

Aggregation of cosmetic changes made during work on REPL PRs: librustc Factored out from hacking on rustc for work on the REPL. r? @Centril

Rollup merge of rust-lang#64235 - mati865:env_logger, r=alexcrichton

1be1e9c

Upgrade env_logger to 0.6

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Sep 7, 2019

Centril mentioned this pull request Sep 7, 2019

Update rustc-guide #64195

Merged

Centril closed this Sep 7, 2019

Centril deleted the rollup-sn4femn branch September 7, 2019 18:01

Centril added the rollup A PR which is a rollup label Oct 24, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 6 pull requests #64257

Rollup of 6 pull requests #64257

Centril commented Sep 7, 2019

Centril commented Sep 7, 2019

bors commented Sep 7, 2019

bors commented Sep 7, 2019

rust-highfive commented Sep 7, 2019

Rollup of 6 pull requests #64257

Rollup of 6 pull requests #64257

Conversation

Centril commented Sep 7, 2019

Centril commented Sep 7, 2019

bors commented Sep 7, 2019

bors commented Sep 7, 2019

rust-highfive commented Sep 7, 2019